//
//  ViewController.m
//  冲突解决
//
//  Created by wszyxc on 16/7/4.
//  Copyright © 2016年 wszyxc. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    
    NSLog(@"111");
    // Do any additional setup after loading the view, typically from a nib.
    
    NSLog(@"这是新人加入,谢谢关照!😊");
    
    
    NSLog(@"成功");
    NSLog(@"解决所有问题了1111111");
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
